Merge tag 'upstream/0.1.18'

Upstream version 0.1.18

# gpg: Signature made Tue 21 Jun 2016 09:56:21 PM CEST
# gpg:                using RSA key 0x0612F4944ECDCD5A
# gpg: Good signature from "Matteo F. Vescovi <mfv@debian.org>" [unknown]
# gpg:                 aka "Matteo F. Vescovi <mfvescovi@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 4E8E 810A 6B44 5FDE 68DA  D025 8062 3989 83B2 CF7A
#      Subkey fingerprint: F3DD 09F8 DA87 D1DF 5046  C99B 0612 F494 4ECD CD5A